Simply do not declare module_exit() handlers for netback/blkback, rather

than declaring the modules unsafe.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
index 48be015532009f4a6e8fe0cd258868df7a31ee34..ae240a601f844ea7c6bf4a7cd85b951e4ddd8170 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
@@ -571,19 +571,12 @@ static int __init blkif_init(void)
                list_add_tail(&pending_reqs[i].free_list, &pending_free);
     
        blkif_xenbus_init();
-       __unsafe(THIS_MODULE);
+
        return 0;
 }
 
 module_init(blkif_init);
 
-static void blkif_exit(void)
-{
-       BUG();
-}
-
-module_exit(blkif_exit);
-
 MODULE_LICENSE("Dual BSD/GPL");
 
 /*

diff --git a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c
index b5d3107951ffa770189bfc57ca6f0b31da17ce64..60628ea9b4f72af4897b13823fe0156a5c2f8f91 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c
@@ -849,18 +849,10 @@ static int __init netback_init(void)
                &netif_be_dbg);
 #endif
 
-       __unsafe(THIS_MODULE);
-
        return 0;
 }
 
-static void netback_cleanup(void)
-{
-       BUG();
-}
-
 module_init(netback_init);
-module_exit(netback_cleanup);
 
 MODULE_LICENSE("Dual BSD/GPL");